# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1069.175.10 -> 1.1069.175.11 # Makefile 1.193.1.44 -> 1.193.1.45 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 04/01/15 bjorn.helgaas@hp.com 1.1140 # Merge hp.com:/home/helgaas/linux/ia64-extras # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # -------------------------------------------- # 04/01/15 bjorn.helgaas@hp.com 1.1141 # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # -------------------------------------------- # 04/01/15 bjorn.helgaas@hp.com 1.1069.175.11 # Fix SUBLEVEL typo. # -------------------------------------------- # diff -Nru a/Makefile b/Makefile --- a/Makefile Thu Jan 15 16:36:10 2004 +++ b/Makefile Thu Jan 15 16:36:10 2004 @@ -1,6 +1,6 @@ VERSION = 2 PATCHLEVEL = 4 -UBLEVEL = 25 +SUBLEVEL = 25 EXTRAVERSION = -pre5 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)